Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 3 Nov 2005 01:45:07 +0000 (02:45 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 3 Nov 2005 01:45:07 +0000 (02:45 +0100)

Trivial merge